merge
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Mon, 27 Feb 2006 11:02:00 +0000 (11:02 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Mon, 27 Feb 2006 11:02:00 +0000 (11:02 +0000)

Trivial merge